]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
js/Makefile.am: Fix dependency generation with srcdir != builddir
authorOwen W. Taylor <otaylor@fishsoup.net>
Thu, 5 Jun 2014 19:00:01 +0000 (15:00 -0400)
committerOwen W. Taylor <otaylor@fishsoup.net>
Sun, 29 Jun 2014 22:27:53 +0000 (18:27 -0400)
If reusing an existing separate builddir, the generation of dependencies
for the JS resource file would fail because it couldn't find misc/config.js,
resulting in the resource file not being regenerated.

https://bugzilla.gnome.org/show_bug.cgi?id=732348

js/Makefile.am

index 09ceab16b25bd493eb69aff592c2140d8a3f9aed..6d9b85b0852e22b2c9dcabf289845fea428702d5 100644 (file)
@@ -13,7 +13,7 @@ misc/config.js: misc/config.js.in Makefile
            -e "s|[@]sysconfdir@|$(sysconfdir)|g" \
                $< > $@
 
-js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
+js_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate-dependencies $(srcdir)/js-resources.gresource.xml)
 js-resources.h: js-resources.gresource.xml $(js_resource_files) misc/config.js
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) --generate --c-name shell_js_resources $<
 js-resources.c: js-resources.gresource.xml $(js_resource_files) misc/config.js